merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 1 Sep 2010 00:55:43 +0000 (09:55 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 1 Sep 2010 00:55:43 +0000 (09:55 +0900)
commitf6022a7f0d947393063eb1af98e055b7019c204b
tree14fa66151da18901d66217cc9b72cc6829d3e99c
parent8b7e0cef1f830ec43b360cc1640af50b0f2fe2c7
parent09afb6a569b631369759c929ab5c50011253c66c
merge trunk